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

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

Change-Id: I2ccf9e6d51d705021f26bdffb2e1d29fbe6f206e