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

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

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