Merge "Fix cts com.android.cts.devicepolicy.ManagedProfileTest#testLockNowWithKeyEviction" into rvc-dev