[automerger skipped] Merge "Merge "Streamline...

[automerger skipped] Merge "Merge "Streamline stack/btm/btm_sec::BTM_SetEncryption" am: 63a911a9 am: a0f8ace5 am: 096cef44 am: 87e8b189" into tm-dev am: 8533cc0e am: 504d1392 -s ours am: ac905b90 -s ours

am skip reason: Merged-In I7a28556d880ff14cc3fed29215b5d9fbd99cc831 with SHA-1 f3d10bb5 is already in history

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



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