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: Ia21a03d3b124d0979466571f4d0087e5e2589a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>