[automerger skipped] Merge "[DO NOT MERGE] fpService#authWithPrompt uses...

[automerger skipped] Merge "[DO NOT MERGE] fpService#authWithPrompt uses correct user handle." into sc-dev am: f7d906ad am: 7f49832d -s ours am: 6fb33323 -s ours am: 2f12a71b -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19911498



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