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

Change-Id: Id475a570188d5109e3d77d77f47e77dc6376ff51