Merge "[automerger skipped] coral: update kernel-and-modules prebuilt am: 1f7d34e0b7 -s ours am: e1aacb263c -s ours" into tm-d1-dev-plus-aosp