am b5b719ab: am d2137887: Merge "Change the order of permission checks for...
am b5b719ab: am d2137887: Merge "Change the order of permission checks for READ_PHONE_STATE." into mnc-dev
* commit 'b5b719ab':
Change the order of permission checks for READ_PHONE_STATE.