Merge "kernel.config OWNERS += smoreland" am: bd93d6f9c6 am: 78f3186c38

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2470262

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