Merge "Use auto specific system property to fix car service package" into tm-dev am: bbdc07f3 am: c5ae2581

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17010737

Change-Id: I3386ca3ff8a620ace54b3fa8a87a6b6317de0ef0