[automerger skipped] Merge changes from topic "multi-kernel-mod-dirs" into...

[automerger skipped] Merge changes from topic "multi-kernel-mod-dirs" into rvc-dev am: 0917ad04 am: 96c73901 am: ead30a79 -s ours am: 8f3fecd4 -s ours

am skip reason: Change-Id I92eadd8617f03a645da460ccb776bc04fa541f00 with SHA-1 e35d2179 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11711957

Change-Id: I6b1ea8557d286b68a0e2e131dbe153ea488d43fc