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

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

Change-Id: If01ab425d1ab972ebaae24786714fae942097d93