Merge "Fix wrong array index bound in NotificationUsageStats"