Merge "Disable "-readability-duplicate-include" tidy warning in generated file" am: e6c05a8fd7 am: 07888666d2 am: 92d4ec9cd5

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

Change-Id: Id5cca221c2e7c80c66d3233020e0900faee230c2