Merge "Only write appcompat properties if flag is defined" into main am: b46dcf4f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3049844



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