[automerger skipped] Merge "Add unit tests to AuthController" into udc-d1-dev...

[automerger skipped] Merge "Add unit tests to AuthController" into udc-d1-dev am: 6efc35ce am: ed6a08bb -s ours am: 33b49f9e -s ours

am skip reason: Merged-In Id5b35ab528f2c41b98aac8ab4cfa49a9108f4236 with SHA-1 e9770af6 is already in history

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



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