Merge "Give uid media REGISTER_STATS_PULL_ATOM permission" into sc-dev