Merge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449
am: 1249e0a1b0

Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb