Merge "Delete more unused includes in statsd" am: 9255edfa7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373818

Change-Id: Ia736ebfa07a257fc6963615de740854d9d75fafa