Merge "Revert "AOSP/Music - Updated to sdkVersion 29.""