[automerger skipped] Backport "Enforce authentication if encryption is...

[automerger skipped] Backport "Enforce authentication if encryption is required" am: f3cd05d1 -s ours am: 31bc7750 -s ours

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

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



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