am f7f98b03: am 6b9b134f: Merge "Removing OrSelf check when checking for...
am f7f98b03: am 6b9b134f: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev
* commit 'f7f98b03':
Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.