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: Ibdbdbf378792209734722235640586b632be62ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>