Merge changes from topic "flexiglass-authmethod-is-a-flow" into udc-qpr-dev am: b91eb315

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



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