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 am: a463d12d
Change-Id: Ia1f644bedf5530c78cdd25698d85206f33855598