(This is a merge of wvgerrit/25422) OEMCrypto_ERROR_KEY_EXPIRED was not always being reported to the higher layers as a NEED_KEY error, which could cause inconsistent error handling. Bug: 28294273 Test: Unit tests Change-Id: Idf5642ea0f0ba915bc1f53025a1f14691d142aed