Merge "Polish up metadata propagation for native window" into tm-dev am:...

Merge "Polish up metadata propagation for native window" into tm-dev am: 96329101 am: 8cdf3d41 am: 98e1b73d

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



Change-Id: I365eb19a7075cd55fefc3fc6aa704c7ac6d0f514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>