Merge "Update SystemSettingsValidators to support Dock plug type" into udc-dev am: 2cbedeb0 am: 210305c6

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



Change-Id: I2cb76fdb19ee6276fb3971ccfb9da61bb2ddf3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>