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

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

Change-Id: Ib7d5d24584518b886808c79419c072f2ba3b13d7