Snap for 7161250 from 3a912bc775d662a075ed7c8d278e77d780c57213 to sc-release am: 0c6fdf9845

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/13657457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff6abc4f066b9a619a5e5348f640a19c5c35099