Merge "fpService#authWithPrompt uses correct user handle." into tm-dev am: e891733b

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



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