am b5538bb2: (-s ours) am 43d23ef3: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev

* commit 'b5538bb2ddff6eb4f5d47660f39da4163f6613f1':