Merge "Merge "fpService#authWithPrompt uses correct user handle." into...

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

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



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