[automerger skipped] Merge "Revert "Rollback package after reboot has been...

[automerger skipped] Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 am: f0eef249 am: 3fde5e79 -s ours am: 6edb4881 -s ours

am skip reason: Merged-In If5612bd68cd0ba7c3b9e9f68dac84be3f1482164 with SHA-1 dfb2bfeb is already in history

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



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