[automerger skipped] Merge "gatt: Improve handling outstanging encryption"...

[automerger skipped] Merge "gatt: Improve handling outstanging encryption" into tm-qpr-dev am: 65ba7458 am: 24fc24b9 -s ours

am skip reason: Merged-In I81f39baa45506e54f19898e7b3240967db989916 with SHA-1 38d11b73 is already in history

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



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