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

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

Change-Id: Id16c1c00c34838462d1a3369163c687bf6507039