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

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

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