Merge "API level 30 upgrade: AOSP/Music" am: 4284751db0

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

Change-Id: I5e9f53b394f4ecb05f81e0d192ec471ca063fbb1