Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev am: 585422a5d2 am: 7e8e915b2b
am: 4f5cabfaa9

Change-Id: I9ec865381013df76099719130186209b4c8015e1