Merge "Mark CarSystemUI as a override to SystemUI"