Merge "Update TEST_MAPPING in drm/mediadrm/plugins" am: 2bb11bb239 am: 6b799a60e9

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

Change-Id: I70dbd3165524cd72f4b9631f1405af84dd4bca20