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

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



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