Merge "Respect app-ops permission in FileIntegrityService" into rvc-dev am: 0e6240f8b9 am: 528f161483 am: 6e73201e71

Change-Id: I48a3026745ed62c5819456a9a4dae0d50f43cefe