Merge "Fix for CtsNetTestCasesUpdateStatsPermission" into android15-tests-dev