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: 29cb2f76

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

Change-Id: Ia1270a78c714b485744edff797e2a9ee7d5239a1