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

Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46