Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." into oc-mr1-dev
am: 20bbecfd86

Change-Id: I5a966e56da86d48892d917b02442ee7deffb39cb