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

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



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