[automerger skipped] Skip ab/6749736 in stage. am: a5a04bfd32 -s ours am: 86ccb1c0ae -s ours

am skip reason: Change-Id I5228ea3076cd22c9c670ab48624d526eabf1b634 with SHA-1 d7549bd69b is in history

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

Change-Id: Ic16c7624bf51ab96bed7a9d72a5e086f8924deae