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

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

Change-Id: I7736d29f0c3f5f9b83acf34796d9b199190a741e