Merge "Delete more unused includes in statsd" into rvc-dev-plus-aosp am:...

Merge "Delete more unused includes in statsd" into rvc-dev-plus-aosp am: 521bba25 am: 9f97e7c0 am: a018cdcb

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

Change-Id: If97258407c8df55c5e0c8eada53c5282267172b9