Merge "libandroid: map remove extra '#'" into main am: 5d493261bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2889451

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