Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity"
am: 05f6de16d3

Change-Id: I0c039776d6a7c71d91dfc391fcb050d425bace4a