[automerger skipped] Merge "Initialize the appcompat system property folder"...

[automerger skipped] Merge "Initialize the appcompat system property folder" into main am: 1f5e8771 am: d7095f37 am: 08050a1c -s ours

am skip reason: Merged-In I0c6a0f66dc543c6e861bc86a417e4feb5ecd7789 with SHA-1 5ae7a805 is already in history

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



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