Merge "canned fs_config accepts multiple lines having the same path" am: 1d3b45e4fa

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

Change-Id: I06b5dc6984153e0a9e7158dc2b0e4c0d8a375045