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

Change-Id: Iafd1e341d6e1054453bf1db6d880abe227fac631