Merge "Change API format in the map file." into main am: 2be985dfdb am: 2d0888c858 am: 4b8ca6a75b

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

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