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

Change-Id: I8646befa83e7a78a2e661ee25f99573093075fb2