[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously"...

[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8 -s ours am: c6d15199 -s ours

am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e8 is already in history

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



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