Merge "Media - Fix sysui crash on media image load" into rvc-qpr-dev am: 0ac2f4e4 am: ed4dcd9d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12494612

Change-Id: Ia19469c1090a99fe430535e04d34b424308653c8