Merge "fs_mgr: Refactor mandatory overlayfs kernel patch checks" into main am: bb1cc95f6c am: c2f876b3db

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

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