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

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



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