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

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

Change-Id: I83c8486c66647462dd7befeebf5c2926613dd179