[automerger skipped] Merge "Enable rollback lifetime API changes during install" into main am: 1034330c5a -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: Ib0d7c657690015e89848834f4d959e8af035f064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>