[automerger skipped] gatt: Improve handling outstanging encryption am: 38d11b73 -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: Iebaeb1952c8be09994179628587922f1f4c4bb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>