Merge "Don't use Android properties outside of Android" into main am: 897ac13a91

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2819218

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