Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582' * commit '0237cf2eace5d35410e95f586fd40c3068c94582': Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582' * commit '0237cf2eace5d35410e95f586fd40c3068c94582': Mark MODIFY_PHONE_STATE permission as signatureOrSystem