Merge "Revert "Rollback package after reboot has been performed"" into main...

Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 am: f0eef249

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



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