Merge "fpService#authWithPrompt uses correct user handle." into sc-v2-dev am:...

Merge "fpService#authWithPrompt uses correct user handle." into sc-v2-dev am: bc7a81d2 am: 35d6d4fa am: 01d952c6 am: 1a43d1b5

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



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