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

Change-Id: Idb8f72137844d370fa9e95195dd6b57cbaf3391e