Merge "Merge "Unlocked empty auth entry shouldn't be clickable anymore" into...

Merge "Merge "Unlocked empty auth entry shouldn't be clickable anymore" into udc-dev am: 02416e15 am: 4a712b5b am: 18b1ed19" into udc-qpr-dev-plus-aosp am: 979e8280

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



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