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

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



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