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: 59402af6

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



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