Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598ee am:...

Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598ee am: 6c423b16 am: df6f18e7 am: 6bf41e24

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

Change-Id: I7ccfe53f41012e7f1c4c0be766f88619541dc19f