[automerger skipped] Enforce authentication if encryption is required am: 0a8c39cd am: b78a735e am: a1699381 -s ours am: 684761c6 -s ours am: 2b183dff -s ours am: 7eb7b46f -s ours am: e0cfaf83 -s ours

am skip reason: Merged-In I0370ed2e3166d56f708e1981c2126526e1db9eaa with SHA-1 0a8c39cd is already in history

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



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