[automerger skipped] Merge "Fix Autofill dialog does not work" into tm-dev am:...

[automerger skipped] Merge "Fix Autofill dialog does not work" into tm-dev am: f58911cf am: d22a3231 -s ours

am skip reason: Merged-In I9018b8db8673e3b917a303476666ae766fbe7891 with SHA-1 936f665a is already in history

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



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