Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7 am: 6c423b166c

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

Change-Id: I068d9de923165a4799645c81399309b1c1dcf1d1