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

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



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