Merge "Add permissions CAR_CONTROL_AUDIO_SETTINGS and MEDIA_CONTENT_CONTROL" into rvc-qpr-dev am: 2a0eb85b87 am: 7c6a41782c

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

Change-Id: Ic6fe7b5b656039e2376c65eda4c84f108d27680d
tree: 4f95081fdf7c7d908eb4d869bd94279773e08bbf
  1. car-bugreportd/
  2. car-internal-lib/
  3. car-lib/
  4. car-maps-placeholder/
  5. car-systemtest-lib/
  6. car-test-lib/
  7. car-usb-handler/
  8. car_product/
  9. cpp/
  10. evs/
  11. experimental/
  12. FrameworkPackageStubs/
  13. obd2-lib/
  14. packages/
  15. procfs-inspector/
  16. service/
  17. tests/
  18. tools/
  19. user/
  20. vehicle-hal-support-lib/
  21. .clang-format
  22. .gitignore
  23. Android.mk
  24. CleanSpec.mk
  25. CPPLINT.cfg
  26. OWNERS
  27. PREUPLOAD.cfg
  28. README.md
  29. 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.