5ae1d0fa6e
[ Merge of http://go/wvgerrit/165191 ] Previously, when updating a secure stop / usage info record, the existing record was identified by PST. It was assumed that apps would never use the same PST for different licenses; however, this was never enforced. Certain GTS tests use the same PST across multiple tests to identify different licenses. Depending on the order of operations, the periodic updating of the usage entry might overwrite the wrong entry. Key set IDs are generated by the CDM, and are guaranteed to be unique within the scope of the same file system. Given that key set IDs are not expected to be transfered to different licenses, using the key set ID to identify secure stop / usage info records eliminates the possibility of overwriting the wrong entry. Bug: 263316107 Test: device_files_unittest Test: GTS MediaDrmParameterizedTests and MediaDrmStressTest Change-Id: I2e2d50d188e05c8ca6b8095549796b913ea72d7a