Merge "OPP: Only start the service from AdapterService"
tree: 13cfd87c375567a4e5437726beb12401007007a8
  1. android/