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

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15684468

Change-Id: I97c90211dde62ce2eeeaa5ee7cb766c8a672abfe