[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 -s ours

am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history

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

Change-Id: If134aa0914df425907d37d77a2973efe8b168664