Merge "Fix config loading in CTS" am: 7142e94e1b am: 58dfcc0170 am: 87e0370bf2

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

Change-Id: I2c4d647fc07a71a362c5295d3dc91080ef70e3f2