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