Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796 am: f58e0181ba

Original change: https://android-review.googlesource.com/c/platform/development/+/1576367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068da56c1b4cac62da114010e69db2f66f108030