Merge "Add a setting to disable HIDL HALs" into sc-dev