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

Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65 am: 03e548f8

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



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