Merge "Catch the SQLiteFullException in NotificationUsageStats." am: 41537638f0
am: b73b57577a

Change-Id: Icbab740ba22260ede43b7218ac91f4c2337e74b8