Merge "[Ravenwood] Update system property handling" into main am: 5c0d09f8e4 am: d65323c59b

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

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