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 am: 8fc819f8

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



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