Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am:...

Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am: 7c6a0044 am: 99bbb571 am: 8fc819f8 am: e379ccff

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



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