Merge "Merge "Respect app-ops permission in FileIntegrityService" into rvc-dev am: 0e6240f8b9 am: a17b77c14b" into rvc-d1-dev-plus-aosp