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

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

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