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

Merge "Wait to notify encryption complete when bonding" into main am: ba0f75eb am: 8eb2bffc am: 1b4f9505

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



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