[automerger skipped] Merge changes from topic "default-fstab-swapon_all" am:...

[automerger skipped] Merge changes from topic "default-fstab-swapon_all" am: a3ed4653 am: 59f6b8ed -s ours am: 00b774c0 -s ours

am skip reason: Change-Id Icd706fe7a1fe16c687cd2811b0a3158d7d2e224e with SHA-1 afaa5fbc is in history

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

Change-Id: I2c8347d9bc360d715a52a565f101ef3ca7d6306f