Merge "Delete more unused includes in statsd" into rvc-dev-plus-aosp am: 521bba25c9 am: 9f97e7c07c

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

Change-Id: Ifcdcd4240cae9ddd2ba867f82c1bf371349aab79