Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev