Merge changes from topic "canned_fs_config" am: ae9cf263 am: 33fd6011 am:...

Merge changes from topic "canned_fs_config" am: ae9cf263 am: 33fd6011 am: a2143519 am: 7cc9a751

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918606
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918605


Change-Id: I484e46ff819a5266c1e8046dae337e18ef3fefea
Merged-In: I484e46ff819a5266c1e8046dae337e18ef3fefea
Merged-In: I7f2576ff99c65bdb6c9ce4ace61bc783eea2f0d4
(cherry picked from commit 755e3808)