Merge "canned fs_config accepts multiple lines having the same path" am: 1d3b45e4fa am: 281bedd9d0 am: b1e5cd3857 am: d0746f98d6

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

Change-Id: I43902fed08db1b4968d02c75fac0a47976fff72a
Merged-In: I43902fed08db1b4968d02c75fac0a47976fff72a
(cherry picked from commit 0bc05d87c761b36a45b8ef75f95bd24202725948)
1 file changed