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

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

Change-Id: I7ccfe53f41012e7f1c4c0be766f88619541dc19f