Merge "Adding cts for UsageStatsManager#queryEventsForSelf"