Merge "Require READ_PHONE_STATE for DO/PO dev ID access"