[automerger skipped] Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed9 am: 4ceb9142 am: 74274f37 -s ours
am skip reason: Change-Id I779aa12bea633cee755aba46231e1b8c8e67b2cd with SHA-1 4a728ca2 is in history
Change-Id: If64ccfd4fd8b8a84490fcce10705c90ef794f469