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 am: 4ff85e52

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



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