Merge "libnativewindow: map remove extra '#'" into main am: 325c1e10 am: 3404c495

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



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