[automerger skipped] New Pipeline: Implement lifetime extension for guts am:...

[automerger skipped] New Pipeline: Implement lifetime extension for guts am: f7ec42ff am: c0876d89 -s ours

am skip reason: Merged-In Icaeb83fc41bf92328e66b3a9a6ecc5ba23e515d9 with SHA-1 d5b52e01 is already in history

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

Change-Id: I31ae62471055f80419d9b3052d8f03813726b695