Merge "OverlayFS support for fstab" am: 7cdbd8e64d am: 1e5400b429

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

Change-Id: I4957d39a8217ea4b365eea73f32f5bc53cb8f4af