[automerger skipped] Refactoring API names to increase scope for future am:...

[automerger skipped] Refactoring API names to increase scope for future am: 1c80ba32 -s ours am: 97fb68a3 -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: I6de3c7610517ad3b123a8dd133a57e3af8e57f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>