[automerger skipped] Merge "Fully deprecate sys prop for aconfig flags" into...

[automerger skipped] Merge "Fully deprecate sys prop for aconfig flags" into main am: 42a0e321 -s ours

am skip reason: Merged-In I51e9cf39b459e651c0bcc5b74445c660a44469f0 with SHA-1 9509263c is already in history

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



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