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

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

Change-Id: I95393a493d34728aa3fdcff73925e8a2145b0e0a