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

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



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