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

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

Change-Id: I9d85d7fb0482a98345fd462bdfbefb9b5bfd6515