Merge "Clean up the check of AuthType in simialr()" am: 3911dab442

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

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