[automerger skipped] aoc: s2mpu: Don't configure S2MPU am: d241999727 -s ours

am skip reason: Merged-In I7d4b1e5d0146ab8869f0af7db49d52179f747b3b with SHA-1 c900d2625a is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/2877744

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