Merge "Only runtime and appop perms need to be in RUNTIME_AND_APPOP_PERMISSIONS_OPS" into rvc-dev am: 03eb7a1b am: 506b1136 Change-Id: I2222aa6fe9f5f158cb53037154db070bced56b3a