Mark ab/6881855 as merged am: 683d33932a am: db823d6e6e

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

Change-Id: I530dcf78418cf3dc5d990bf74296f306db8dbbe4