[automerger skipped] Merge "Use RavenwoodRule for system properties" into main am: 8b965335d3 am: bc3a7684c3 -s ours

am skip reason: Merged-In I9b9a5c4f8987ba32353d25ebb3840b725c246e77 with SHA-1 6508ac8505 is already in history

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

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