Merge "Fix smart reply lifetime extension" into sc-v2-dev am: 1306ecac31

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

Change-Id: I5ac9d3c45bc9e5536d5a44aca978ead9718b70d5