Merge "Update TEST_MAPPING to include CtsMediaEncoderTestCases" am: e846eed9cd am: 26142b30a2 am: 94f73714de am: 80d678c0a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1941097

Change-Id: I3fc4295d947c875657b3ce70d1c984564a11feaf