Merge "Propagate individual aconfig sysprop on flag stage" into main am: 1dd87ad1

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



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