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

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



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