Merge "Wait to notify encryption complete when bonding" into main am:...

Merge "Wait to notify encryption complete when bonding" into main am: ba0f75eb am: a5bd26f3 am: 8f3bb9f4

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



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