Merge from Widevine repo of http://go/wvgerrit/160720 For DRM, but not for CAS, we allow the entitlement session and the entitled session to be the same. Bug: 253471127 Bug: 246566056 Bug: 245018059 Bug: 242815450 Test: oemcrypto unit tests on oriole (all but CAS tests pass) Test: GTS Change-Id: Ib830484be8437b1c4ce34500ae912e6c119dcfc3