Merge "AOSP/Music - Add Kotlin version of Music Java code"