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: e1913786

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



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