Merge "One second delay introduced to avoid setting app interference" into...

Merge "One second delay introduced to avoid setting app interference" into main am: 8be4a2b0 am: 5660db98

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



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