Mark ab/6881855 as merged am: 4e0faaeced am: 716864e6d7

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

Change-Id: I6dd74ee6add72005598bb4b6283d0fbd6f4164a0