Merge "Fix for FeatureSummaryActivity#Hardware/Software Feature Summary" into nougat-cts-dev