Merge "Merge "Fix view does not show fill dialog" into tm-qpr-dev am:...

Merge "Merge "Fix view does not show fill dialog" into tm-qpr-dev am: 5bca0e00" into tm-qpr-dev-plus-aosp am: a2caef3d

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



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