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

[automerger skipped] Merge "Refactoring API names to increase scope for future" into tm-mainline-prod am: 90204c34 -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/+/21522480



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