Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645



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