Merge "Do not end CTS invocation on device info failure" into nougat-cts-dev