Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...