[automerger skipped] Merge "libnativewindow: map remove extra '#'" into main...

[automerger skipped] Merge "libnativewindow: map remove extra '#'" into main am: 325c1e10 am: 3404c495 am: afccce8d -s ours

am skip reason: Merged-In I63855cdced5361c2cc35b21d966c45c677b12995 with SHA-1 dfc8d609 is already in history

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



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