Merge "Merge "Set sdk_version for Music app" am: 55c1587d69 am: f90d005407 am: fd84bcdb2a am: 9efe207140 am: 0419b9f2da"