Merge "Merge "Revert "Statsd: apex modules in uid map"" into qt-dev am: 8bbabee0cd am: 36935ebb7b" into qt-r1-dev-plus-aosp