Merge "Remove SkipMountingPartitions from vendor libfstab" into android10-gsi