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

[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d270 -s ours am: 12705de9 -s ours am: 58834bca -s ours

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

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



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