Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a am: c55e65311c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892

Change-Id: Idd5458e4d9e14b02d648572567d5c8d35910d9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>