Merge "AOSP Music app - Added back SDK Versions and Package Name. Specified android:targetSdkVersion as 28." am: a56019c212
am: 13618a4454

Change-Id: I004b577b635a02d1841229a1b37e643d97c2f822