Merge from Widevine repo of http://go/wvgerrit/26560 With this CL, the modifiable oemcrypto mock will only update the SRM version number if the new number is greater than or equal to the current one. b/37744957 Change-Id: I10721146ca0ce24b1087657e18569a434e5d53b8