Merge branch 'android-4.14-p' of https://android.googlesource.com/kernel/common into lineage-18.1

Change-Id: I530fb9e170d84ae69861b2de20aca01201ebbd98