[automerger skipped] Merge "Make sure to disassociate all the packages with...

[automerger skipped] Merge "Make sure to disassociate all the packages with shared UID" into udc-qpr-dev am: 667c3bc4 -s ours

am skip reason: Merged-In I3cccad4e85e77916cff020eb7087ac2c355e3e23 with SHA-1 69baf67a is already in history

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



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