Merge "Check calling package for calling UID consistency with phoneAccountHandle"