Merge "[automerger skipped] Merge "Fix Autofill dialog does not work" into...

Merge "[automerger skipped] Merge "Fix Autofill dialog does not work" into tm-dev am: f58911cf am: 6500b2ef am: a388f84a -s ours" into tm-qpr-dev-plus-aosp am: e0d3da08 -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: I4195b3141eb45bbd4a4008631ed96151de664a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>