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

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



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