Merge "Merge "Ignore configComponentName_shouldResolve as it is failing for...

Merge "Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev am: 1892bddf am: 9c57bfbf" into udc-d1-dev-plus-aosp am: 55c91828

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



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