Merge "Ensure smart replies are always visible" into sc-v2-dev am: 96d821aa am: 6af22542

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

Change-Id: Ie02214a34f18411b37e51a18da5617d63d05f9cd