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

Change-Id: I9e9190754cab0fac4199e0660d5255baad97bed5