[automerger skipped] Merge "Return the focus back to the default display when FixedActivity gets it." into rvc-qpr-dev am: 6724e55639 am: 118d2069d3 -s ours

am skip reason: Change-Id Iddb608b5f6c4ac291cd19720bf08c421c76c81c7 with SHA-1 414d44872f is in history

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

Change-Id: I5abef5a4701153ab6d6ca433e9051b9f11a45816
tree: 78b4456a855a89581a7c0352fa14a179c2357ed3
  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.