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

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



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