Merge "Fix the breakage for the new REPORT_USAGE_STATS permission check" into main