Merge changes I828ff9d5,Id7844c3a

* changes:
  Implement PreferredSimFallbackProvider
  Use lambdas in CompositePhoneLookup.