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

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

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

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



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