[automerger skipped] Merge "Clean up the check of AuthType in simialr()" am: 3911dab4 am: 3346b224 am: 74a12ab0 -s ours

am skip reason: Merged-In I1b19e91d0f3e443a9cc611c88ae289ef3e6d9ce2 with SHA-1 09f5f98f is already in history

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



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