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