Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev