Merge branch 'android-4.14-q' of https://android.googlesource.com/kernel/common into lineage-20_4.14.303

Change-Id: Ib15b1e303686224741d013e5e3bcfba365f82627