[automerged blank] Merge "canned fs_config accepts multiple lines having the...

[automerged blank] Merge "canned fs_config accepts multiple lines having the same path" am: 1d3b45e4 am: 281bedd9 am: b1e5cd38 am: d0746f98 2p: c0c59c62

Blank merge reason: Change-Id I43902fed08db1b4968d02c75fac0a47976fff72a with SHA-1 4bd36874 is in history

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

Change-Id: Ia3fbf25903fa5fb441ccaf17a9f2eb37d58ef123