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: I7d53bde4e0bf0ce65a7467e93af8a2ea46216ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>