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

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

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