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

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

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