Merge "Fix flaky BluetoothOppBtEnablingActivityTest#onKeyDown_cancelProgress"...

Merge "Fix flaky BluetoothOppBtEnablingActivityTest#onKeyDown_cancelProgress" into main am: d4a273aa

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



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