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

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

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



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