[ Merge of http://go/wvgerrit/151311 ] Missing a check for provision 4.0. Note: This CL is merged out of sequence with the CDM repo, resulting in a slightly different CL. [ Conflicting CL http://ag/18244016 ] Test: Native test crypto_session_unittest Bug: 180530495 Bug: 236317198 Change-Id: I79f753ba43098e1a3422c39b9903f57e5df03af2