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

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



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