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

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



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