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

Change-Id: If51d8ca2a96a72a06a2744f92b1d8419a552fc95