Merge '4.14.315' of https://android.googlesource.com/kernel/common into lineage-20

Change-Id: Ie4a7227ddd1ae397904cdce8ba53a7f9ab3e1238