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

Change-Id: I067a46e3c4937c5cc3713d1f4080975ff8aa3698