Merge "Fix Autofill dialog does not work" into tm-dev am: f58911cf

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



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