Merge "fix statsd tests hasFeature detection" into stage-aosp-sc-ts-dev