Merge from Widevine repo of http://go/wvgerrit/42102 The unit test should use the real system id if it is using a real oemcrypto. test: ran unit tests on sailfish. bug: 72718962 Change-Id: Ib58a47976f85b840c6f34d379b1c020e7e85d59a