[automerger skipped] Merge "Fix Autofill dialog does not work" into tm-dev am: f58911cf am: 6500b2ef am: 2b201230 am: be32b885 -s ours

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

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



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