Merge "Use consistent names in api_surface" into main am: b6c589db

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



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