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

Change-Id: Ia256495932cf831b7c88884f0f2276f70d5dcd6f