Merge changes from topic "flexiglass-authmethod-is-a-flow" into udc-qpr-dev...

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

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



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