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

[automerger skipped] Reorganize the code for checking auth requirement am: 6bacbe90 am: 1102fdba -s ours am: a01307df -s ours

am skip reason: Merged-In I976a5a6d7bb819fd6accdc71eb1501b9606f3ae4 with SHA-1 916b6d38 is already in history

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



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