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

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

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



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