Strange commit
Revert "Strange commit"

This reverts commit c863b8a642479379fbf11555d9ac0eba7f0485e7.
Revert "Add explicit refererences and logging to KeyguardSim/Puk"

This reverts commit 4fc2b01fd0c8b6e0d4f82657d1ab2ff642a32696.
telephony: IMS changes for VoLTE and VT

- Add IMS phone type constant
- Add system property persist.radio.calls.on.ims.
  It is set to true if VoLTE/VT calls are supported,
  false otherwise

Change-Id: I1296184fd70ea6da2adabdc35ad1d2fb25cdfc70
(cherry picked from commit b6b39f1792231aa435af56b16a5a5c53a50a3845)
(cherry picked from commit 69ac4a60fb230442c718dae44ccf44d2e5d41b7d)
(cherry picked from commit 2748954064ea4aef5b047668534d9332bd671e01)
Revert "Revert "Add explicit refererences and logging to KeyguardSim/Puk""

This reverts commit 483c3abadf62b5e0db29aaae1a707cb6f3d028c7.
Revert 02babf6..f2613b4

This rolls back to commit 02babf6a5584644728f6607178b813156d582478.
Merge branch 'kk44' of https://github.com/iCarbon/android_frameworks_base into kk44

Conflicts:
	telephony/java/com/android/internal/telephony/TelephonyProperties.java