Unfold the result of output-kernel am: 239b3e9cda am: b1d8bbbbe0

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

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