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: 506b1136 am: e945311a am: a8899467
Change-Id: I60399a2715a8a52b7e0ef61f7d59b2f6ac034e2d