am 2ef2d46f: (-s ours) am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '2ef2d46f5dbc29314a731e9211bd6cbd51528867':