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

[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev am: b0a9ebae -s ours am: 47f53bd8 -s ours

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

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



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