Merge "Revert "Revert "Minor refactor of CarServiceHelperService""" into rvc-dev am: 492c8a7f38

Change-Id: I7d50c11846f05ea75cb7de8765a7876ae3e11643
tree: 722e9291dcc11a611286410ba96de159eae85005
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS