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

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



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