[automerger skipped] Merge "Fix smart reply lifetime extension" into sc-v2-dev...

[automerger skipped] Merge "Fix smart reply lifetime extension" into sc-v2-dev am: 1306ecac am: 3579c4fe -s ours

am skip reason: Merged-In I81d447a84fec83e2b1e283766e4aef646d4db486 with SHA-1 c1b9afe6 is already in history

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

Change-Id: I6ef929b06d05172d1cee643387bbb57dbcabd96d