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

Change-Id: I77c50aa4585eb3f39e286013644b067bf0558dbb