[automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0
-s ours am: 02062edb25
-s ours am: 8e5f1b5b74
-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: I47a92c8f202fc77b83b01d7dcc93d6ae1fe23ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: