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

Change-Id: I8a5ed6f6536b87eaab9d583d7852b1232f582149