Merge "Fix view jumping up in the password disappear..." into tm-qpr-dev am:...

Merge "Fix view jumping up in the password disappear..." into tm-qpr-dev am: 12cc569e am: 2f72e564 am: 894ba27f am: b54a787f

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



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