[automerger skipped] Merge "Propagate individual aconfig sysprop on flag...

[automerger skipped] Merge "Propagate individual aconfig sysprop on flag stage" into main am: 1dd87ad1 am: a9444602 -s ours

am skip reason: Merged-In Ica7781499e73bb47ca8eaf27f38cd3600d2fc556 with SHA-1 eaa18af9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3255616



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