Merge "Refactored some com.android.car.settings.enterprise interfaces." into sc-dev