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

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



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