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: I570b77d524b9daaaa2d83e1e8524b21d9c944d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>