[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: 6d05b035 -s ours am: 245a52c0 -s ours am: cd64f0e3 -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/+/19423651



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