Merge "Fix AOSP gallery mute crash" am: a6df261ea4

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

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