Merge changes I5ee56ddd,Ib9ef2a7b

* changes:
  Expose Conext.NEARBY_SERVICE as SystemApi
  Add NearbyService