Merge "Revert "Only write appcompat properties if flag is defined"" into main...

Merge "Revert "Only write appcompat properties if flag is defined"" into main am: 31b15827 am: 407e5d4c

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



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