Merge "Merge "Modify CTSVerifier FeatureSummaryActivity test for television device type." into nougat-mr1-cts-dev am: dbc4ac97c9" into oreo-cts-dev
am: c38f47c846

Change-Id: I439018afb43977ef459ebe2bcfc5fc9aafeb5dbc