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