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

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

Change-Id: I03e1fa32318dc2e404962b504f37d2e7092ddc78