Unfold the result of output-kernel am: 239b3e9cda

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

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