Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main am: cdd4cb7db8 am: 203b44e3ab

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

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