Merge "zenfone7: Decommonize kernel source" into android-11