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

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



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