Merge "Services: start PBAP and OPP like other services" am: 065124a104
am: bff498a10a

Change-Id: If279435e68c4f8bd65487ab3cbd7f1a73a94bc21
tree: be980c61dd12cd497bca4c6259bd831908597bad
  1. android/