Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5 am: 87cbf89f8a

Change-Id: I1afb58af0871db263d9d6b0d28bb1b5e7455d275