Merge "libincident: map remove extra '#'" into main am: cd5f62f011 am: 378a0d6ebb am: 77d1805c8e

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

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