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

* commit 'e813a61ac59a424021693d98edba6476f8c4e18f':