Merge "Don't remove permission when cleaning up orphaned tree on uninstall"...

Merge "Don't remove permission when cleaning up orphaned tree on uninstall" into tm-qpr-dev am: f0f951f7

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



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