[Merge of https://widevine-internal-review.googlesource.com/#/c/14110/ from widevine cdm repo] Backward compatibility handling was causing L3 usage and clock information to be moved. This caused nonce and other failures when attempting to restore offline keys. b/20025990 Change-Id: I6e0fa1030bcce1a5bdd811a9064989d3b6ce2f04