Merge "Change the order of permission checks for READ_PHONE_STATE." into mnc-dev