Merge "Disable part of CTS that relies on non-public strings" into nougat-mr1-cts-dev