Merge "There's now just one <sys/system_properties.h>." into main am: 3a7758d7cf

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

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