[automerger skipped] Merge "Delete more unused includes in statsd" am:...

[automerger skipped] Merge "Delete more unused includes in statsd" am: 9255edfa am: 9278ca66 -s ours am: 85710844 -s ours am: 8da621ab -s ours am: 5ef1ed0b -s ours

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

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

Change-Id: Id66a52ebd1a8fde41fc2a2240cd0a30a5986b8a6