Merge "Merge changes Ie41e5de9,Ia414fecd into rvc-dev am: 89b4dc9b67 am: 76c0a41b4e am: 86351ac1e1" into rvc-qpr-dev-plus-aosp am: 4b7eb22efa

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Car/+/11803628

Change-Id: I3bb8966d3a7bf8c4b873e5e8fab22cbcaaf8075b
tree: 1a6113b08517ac26957615d64163ad210366c67f
  1. car-bugreportd/
  2. car-default-input-service/
  3. car-internal-lib/
  4. car-lib/
  5. car-maps-placeholder/
  6. car-systemtest-lib/
  7. car-test-lib/
  8. car-usb-handler/
  9. car_product/
  10. computepipe/
  11. evs/
  12. experimental/
  13. FrameworkPackageStubs/
  14. obd2-lib/
  15. procfs-inspector/
  16. service/
  17. surround_view/
  18. tests/
  19. tools/
  20. user/
  21. vehicle-hal-support-lib/
  22. watchdog/
  23. .clang-format
  24. .gitignore
  25. Android.mk
  26. CleanSpec.mk
  27. CPPLINT.cfg
  28. OWNERS
  29. PREUPLOAD.cfg
  30. README.md
  31. TEST_MAPPING
README.md

Native (C++) code format is required to be compatible with .clang-format file. Run

git clang-format --style=file --extension='h,cpp,cc' HEAD~

Note that clang-format is not desirable for Android java files. Therefore the command line above is limited to specific extensions.