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

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



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