aml_med_331115000 (9323934,com.google.android.media)
Snap for 8562061 from afff79c8641d51e53e49f564ce79993b474b6c8c to mainline-media-release

Change-Id: I61ebb3c2b96f4d756af46bf71f0c197f453def2b