Null checks on content resolver query

Bug: 33584356
Test: manual
Change-Id: I05dac1ead1ec1f868f8422d82f245e34a4986ccf
1 file changed