Merge "Fix incorrectly assigned constant in AppOpsManager" into rvc-dev