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

Change-Id: I5020ac4150b7eab2f9ed60fe5184cd2d7acfeaae