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

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



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