Merge "Remove config_displayUsiVersionArray from config.xml" into udc-dev am: 0e8739b0 am: d2019211

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



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