Merge "Add stats logging to ServiceManager and NPMS" into pi-dev am: a26e755900
am: fa3a2acfbc

Change-Id: I30bea4b59318ac1871293739c6c5f2d9b7551fb1