Merge "Set appcompat system properties flag if userdebug/eng" into main am: 7de8a01c

Original change: https://android-review.googlesource.com/c/platform/build/+/3107744



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