Merge "Fix config loading in CTS" am: 7142e94e1b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1511833

Change-Id: Idfd3e36934ff9fd376782409288b3db463b18b2f