Merge from Widevine repo of http://go/wvgerrit/41620 bug: 62739406 test: unit tests Change-Id: I72a64623912305965ff625a45041e2932a41f69b