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: 7e8e915b
Change-Id: I8479394eee16f468101c801430b8f3472a3ce280