Merge "Add shouldCollectMessage parameter to AppOpsManager calls from native code."