aml_med_331612000 (9568309,com.google.android.media)
Snap for 9446874 from f341ef15ee095990cf62521da2a78f7be5c281dd to mainline-media-release

Change-Id: I2823f1dd5e673f9d4243e0c7d65123cfb2f30174