Merge "Revert "Rollback package after reboot has been performed"" into udc-qpr-dev am: b55ed5ef

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



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