Merge "Move build.prop to ./etc subdir for some partitions" am: 90fe62e76e am: e47bb665c0

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

Change-Id: Ib09d8413c20d24652f6188c1c4124f7a4c7a8187