Merge "Fix InstantiationException crash" into main am: adb236d284 am: a1d1ba9e47 am: bd5b410295

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

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