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: 5273393c am: b10d8c82

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



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