Merge "Remove android.software.app_widgets from car_core_hardware.xml"