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: 7884e131 am: 8528879f
Change-Id: I5f948e69728306b7cfb3ed7b3ff19cc696de4db9