Merge "Bluetooth: Wait for provisioning after init flag change" am: b67cbe2631 am: e28a4565ea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640626

Change-Id: I7eca2ddaab55391c63730bf1afcc5c9230235ac9