[automerger skipped] Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a946518 am: 3e56a83493 am: f0eef2499b am: 3fde5e79c9 -s ours

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

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

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