Android O IOT Preview 6 (4475743)
Merge changes Ifcd52b16,I025ea703

* changes:
  Implemented fill for PhoneLookupDataSource.
  Search contacts now update when there are changes to the cp2 db.