Merge "libincident: map remove extra '#'" into main am: cd5f62f011

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

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