Merge "SF: fix metadata blob copy" into tm-dev am: fa8b56be54

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16942716

Change-Id: I64cd59630caa6e7b558d04c25cbd9240574395f5