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

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

Change-Id: I22ebc53eddaf9dc48fee701bb86cf1657143164b