Merge "Prevent system restart while updating package during boot" into udc-dev...

Merge "Prevent system restart while updating package during boot" into udc-dev am: f8e289c6 am: 65e6378f

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



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