Merge "Merge "Remove unused parameter check in MediaDrmMockTest" into oreo-cts-dev am: c024972501"
am: d3c494cd3c

Change-Id: Id6b0141f1592e5277a423022c301fd846c1f54dc