Merge "Revert "Move automotive display service to /system_ext""