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

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

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