Merge "Provide app launch count in UsageStats" into pi-dev
am: 8808edb063

Change-Id: I62a73e647fcbfffe5a56fe8229d8fb79738e2a80