Merge "Remove unused #include." am: c235669ec2 am: 7d741780c9

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

Change-Id: I200d242c3b73571f5b2ce5e4ee9289660066bc14