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

Merge "Don't use Android properties outside of Android" into main am: 897ac13a am: bcfdf390 am: bb331e24

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



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