Merge "Don't enforce declaration of app op permissions without public API."...
Merge "Don't enforce declaration of app op permissions without public API." into rvc-dev am: 16f0eb1e am: 7c4ba468 am: ae8809cc am: 55b0bd18
Change-Id: Ifec3b003eb82239939d9837ed28d10582e07847c