Merge changes If292161e,I0ed86319 into nyc-car-dev

* changes:
  Move CarVendorExtensionManagerTest to carservice
  Fix CarAppFocusManagerTest + improved coverage