Merge "gatt: Improve handling outstanging encryption" am: 3582787b

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



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