Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
am: c8ab224b2a

Change-Id: I600831c2369d5985c22d336e8915ae261b6dfb06