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