Merge "Merge "Remove InterruptedException from MediaParser" into rvc-dev am: 315b8782c4 am: e8a71156f0" into rvc-d1-dev-plus-aosp am: 0bb8df2b72

Change-Id: Iaea1444ba1d9e7b0a8420ec9de6a72174445b728