Merge "Check account type returned by AbstractAccountAuthenticator." into...

Merge "Check account type returned by AbstractAccountAuthenticator." into sc-dev am: c77de1f0 am: 986c2068 am: b84db1ab am: 531e01a3 am: cae2ee36 am: f0fcb782 am: 64573113

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



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