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

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

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



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