[automerger skipped] Merge changes from topic "multi-kernel-mod-dirs" into rvc-dev am: 0917ad04 am: 96c73901 -s ours am: 24285aae -s ours am: 46cdbb07 -s ours

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

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

Change-Id: Ie3c16e34a6451a587d230b50a597959e09604ff9