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

Merge "Refactored some com.android.car.settings.enterprise interfaces." into sc-dev am: 1cbeefce am: c84d5f35 am: 838d5238

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671247

Change-Id: I2628dc7ffd174f0fb1945c1d4f8069023c5f6e60