Merge "Fix failure on mounting system_ext partition" am: 8437b9a0

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



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