Unfold the result of output-kernel am: 239b3e9cda

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17937983

Change-Id: Idbf6982d0d870d00a3fdff5daed781381dba905b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>