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

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

Change-Id: I21d52042dae197f49dddafcae8db3d13d7c0473d