Merge "StatsPerUidLogger: fixed StrictMode policy violation" into main