Merge "Fix InstantiationException crash" into main am: adb236d284

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

Change-Id: Iea9a14e2aeb7786d285bfa945722253927b6aed0
Signed-off-by: Automerger Merge Worker <[email protected]>