[automerger skipped] Don't cancel passkey entry pairing autonomously am:...

[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd -s ours am: 5dd2f5e3 -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: I3e258177d5ffd9802279dc74032992fb7981f479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>