tree 28826afcaa9e658c22cf38e7d194d14a0c6c925f
parent 499d172e622088bf842b0e86ad67df98614145e2
parent 6e73201e71c303ab9e8a8c8acb473bb85924ca95
author TreeHugger Robot <treehugger-gerrit@google.com> 1585354789 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585354789 +0000

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

Change-Id: I48a3026745ed62c5819456a9a4dae0d50f43cefe