Merge "Fix NPE for KeyguardEsimArea#isEsimLocked" into oc-dr1-dev