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

Change-Id: Idbe33d1c02eda4d04642190d4350b81371bf513e