Merge "Merge "Merge "trigger file removal when slice permission is removed" into rvc-dev am: 9c90811d am: 71bf14f0" into rvc-d1-dev-plus-aosp am: d4c7d9da" into rvc-qpr-dev-plus-aosp am: 9b742586

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

Change-Id: Id4bc85486904f21d83c1d0ee09a4ddb6ceba6308