am 0e4a860a: (-s ours) am 3686bb0c: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '0e4a860a8ea9fd9f01aeb2f418b4b8f54d6e6ec5':