Merge changes from topic "modprobe-pgsize-fix" into main am: 0cb931b1 am: e8d6ed05

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



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