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

Change-Id: I18db1e035d6a6e411816b2d5c1a6772940f784a7