[automerger skipped] Don't cancel passkey entry pairing autonomously am: dc7aa0e87f -s ours
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423652
Change-Id: I24e358517dfa629de3e2c936410ae6d254bc5e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: