Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I32d1fc79d18c9b23ac221382c81df367c1f3f7cd Signed-off-by: Automerger Merge Worker <[email protected]>