Merge changes I3d097d14,Idd6604e5

* changes:
  Update preferred SIM SuggestionProvider
  Remove non call log dependencies on PhoneAccountUtil