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

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



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