Merge "Isolate Ravenwood sysprops from device sysprops" into main am: 37c4b1074d am: 105f995b75

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

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