Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp * commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed': Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp * commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed': Mark MODIFY_PHONE_STATE permission as signatureOrSystem