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

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

Change-Id: Ib6961216178d8c2d488fdb0e6d48125dfdd15330