Merge "Make no button fallback to normal suggestions" into tm-qpr-dev am: 1587a365

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



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