[automerger skipped] Merge "Don't remove permission when cleaning up orphaned...

[automerger skipped] Merge "Don't remove permission when cleaning up orphaned tree on uninstall" into tm-qpr-dev am: f0f951f7 am: 3b22bd69 -s ours

am skip reason: Merged-In I86801109ce2d9c2750c6dfef4bb0425df0ab135e with SHA-1 d8572e27 is already in history

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



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