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

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



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