Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread