Merge "Revert "VTS tests for fixed MediaDrm security level APIs""