[automerger skipped] Merge "fs_mgr: Look for fstab file in /system/etc" into...

[automerger skipped] Merge "fs_mgr: Look for fstab file in /system/etc" into sc-qpr1-dev am: 13126885 -s ours am: 397d9d13 -s ours

am skip reason: Merged-In Id083070e51ae85959167e4615cd96b31a0b1bd6a with SHA-1 e98afa26 is already in history

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

Change-Id: I15fc54268cd7d591ad10d50250f26af2c4cdcb34