[automerger skipped] Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949 am: 1a4dbf39f8 -s ours am: 93f651a682 -s ours am: 3291747593 -s ours
am skip reason: Change-Id I779aa12bea633cee755aba46231e1b8c8e67b2cd with SHA-1 4a728ca2e5 is in history
Change-Id: I1630503df4093b9d3d0742d57db20e73551b62f5
This commit is contained in: