Merge "Move the package directory before deleting it." into udc-dev am: 1861463b

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



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