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

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

Change-Id: I0109424e5c54004a180354790c051c15bd74c933