Merge "Fix overlap in auth_credential_password_view" into udc-dev am: b71e0ae4

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



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