Merge "Fixes the bug that can occur when StatsCompanionService calls...
Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev am: 585422a5 am: 41545aa3
am: 9fdf5b35
Change-Id: I971afa4a527a03fc8c00b6974493840f3b2e5e8c