Merge "Overwrite prop.default in all ramdisk fragments" am: b70d35ce am:...

Merge "Overwrite prop.default in all ramdisk fragments" am: b70d35ce am: a6cc8eac am: daa3c4e2

Original change: https://android-review.googlesource.com/c/platform/build/+/2403523



Change-Id: I71468643c9a5e2b3a7ef21a3531e6295aab4fa02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>