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: Ibb55c1c5fcf06abf6fec1139e38db7a67bbdaab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>