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 am: 7f15208c am: cfdb5d9e

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



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