Unfold the result of output-kernel am: 239b3e9cda am: 2b6377fc97

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

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