[automerger skipped] Merge "Refactoring API names to increase scope for...

[automerger skipped] Merge "Refactoring API names to increase scope for future" into tm-qpr-dev am: de829f0c -s ours am: 4bb7f0d2 -s ours

am skip reason: Merged-In Ib0ef1fdc3a9dd03f89b9d67d6b490d9f287b5828 with SHA-1 2bf529b7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21526104



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