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

Change-Id: Ib82cb8f3da55d81757b6e1398856599cfb1e3b32