Prevent NPEs

ContentResolver#query() can return null.  Log if this happens, and don't
crash

Bug: 7225209
Change-Id: Iea8f8ce3da81856562cbc9db793106fa5b118f14
2 files changed