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: d9bb0149" into tm-d1-dev-plus-aosp am: 1c8dc135

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



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