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

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



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