Merge "Update for v4.19 kernel headers." am: e94eb5140c
am: 6d0726b7e0

Change-Id: Idf5d4d3144e451b567eadfeb95c0451b70a3c342