Merge "[Ravenwood] Load default properties from build.prop" into main am: ec7676d1f5 am: d534e0bef5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3308105

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