Android R Beta 2
Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5

Change-Id: Ia2a986cb2c1a03a3d911f0788bfb30111d829b4c