Merge "Only runtime and appop perms need to be in...
Merge "Only runtime and appop perms need to be in RUNTIME_AND_APPOP_PERMISSIONS_OPS" into rvc-dev am: 03eb7a1b am: 14faaa57 am: 05a5bb34 am: f449a875
Change-Id: I7904d3327d07149849987bf91c0f1f2532aad882