Merge "Remove InterruptedException from MediaParser" into rvc-dev am: 315b8782c4

Change-Id: I33dff0f9a64fc5e083e88326692768d88b9a37e3