Merge "Revert "AOSP/Music - Updated to sdkVersion 29."" am: 332a1b40f8

Change-Id: Ic585120e0ac24f9134c3fd123c21bd75efc0f636