Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into...
Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev am: 7840df3d am: 5390bb2f am: eb90ae0e am: 2a3c6cf5
Change-Id: I409878d9fe79abceae0251c4f6bfce4f4c2ed58d