Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5 am: 87cbf89f8a am: be040abccc am: 2da894ea42 am: 134f13db21

Change-Id: I64484bbed41b7fe7af0231ae072e0210b2419321