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

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



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