Merge "Update TEST_MAPPING to include CtsMediaPlayerTestCases" am: f399647e7d am: 6677547ab5

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

Change-Id: If19d99b1ffa35b60b4ad84f3c418d436134d23f4