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

[automerger skipped] Merge "Revert "Rollback package after reboot has been performed"" into udc-qpr-dev am: b55ed5ef am: 0637380a -s ours

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

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



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