[automerger skipped] Merge "Fix testMediaCodecActivity." into pie-cts-dev am: 222fb2132a am: 625604451f -s ours am: 9f5d5edf58 am: 5f2adeee62 -s ours

am skip reason: Change-Id I304c0ad844d95f5957dfe375c6b30722ce7c7170 with SHA-1 81eb242bfc is in history

Change-Id: I4c1879616b6d6f20266b0f249cdb125668e7bac2