[automerger skipped] Merge "Delete more unused includes in statsd" am: 9255edfa7d am: 9278ca6682 -s ours am: 8571084466 -s ours am: 8da621ab74 -s ours

am skip reason: Change-Id Ie639f57f86c2573cd5e06a1fa9397487f4b3f235 with SHA-1 fd5b18820c is in history

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

Change-Id: I14d3946d3e071cea9f12806eafffd6166b593a91