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

Merge "Fix failure on mounting system_ext partition" am: 8437b9a0 am: df10d96f am: 69eeff65 am: 1363082f

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



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