[automerger skipped] Reorganize the code for checking auth requirement am:...

[automerger skipped] Reorganize the code for checking auth requirement am: 6bacbe90 am: 14f581e9 am: e19099a4 -s ours am: 4d10f9c4 -s ours

am skip reason: Merged-In I976a5a6d7bb819fd6accdc71eb1501b9606f3ae4 with SHA-1 6bacbe90 is already in history

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



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