Merge "libnativewindow: map remove extra '#'" into main am: 325c1e106f

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

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