Merge "Merge "Remove InterruptedException from MediaParser" into rvc-dev am: 315b8782c4 am: c285be9e5f" into rvc-d1-dev-plus-aosp am: c33de53519

Change-Id: Ib81c31c4db9d344f4aa78513f17e17cf4277704a