Merge "libandroid: map remove extra '#'" into main am: 5d493261bb am: 911c19fe7d am: 84b2a52986

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

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