[automerger skipped] Enable rollback lifetime API changes during install am: 42ef4d2aa8 -s ours am: 6dad41b8ba -s ours

am skip reason: Merged-In Ia244caab1284d3468cbe75d3c6741f88a165f043 with SHA-1 4b1cde5710 is already in history

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

Change-Id: I7ba52b448e9d1ec1f25311d1e248910d68345101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>