Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am:...

Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am: 7c6a0044 am: 99bbb571

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779



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