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

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

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