Merge "Ignore additional encrypt change events when link is auth & encrypted"...

Merge "Ignore additional encrypt change events when link is auth & encrypted" am: 986e30c3 am: c330d3d6 am: 4c7fdba5

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



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