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

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



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