Merge "Honor PreferImmediatelyAvailableCred for password / custom options." into udc-dev am: 127453a476

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

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