Merge "Rollback package after reboot has been performed" into udc-dev am: 81530e99

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



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