Merge "Merge "Rollback dropdown or inline suggestions when cancel fill dialog"...

Merge "Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65 am: 59402af6 am: c76e53c6" into tm-qpr-dev-plus-aosp am: 0b879947

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



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