Merge "Check callingpackage for calling UID consistency with phoneAccountHandle."