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

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

Change-Id: I96ad8addcaf23193d5044c2bc1233af646bcd27f