[automerger skipped] Merge "Route flag requests to both sockets if mainline...

[automerger skipped] Merge "Route flag requests to both sockets if mainline aconfigd is also enabled" into main am: f4eb0620 am: bc6bb5b1 -s ours

am skip reason: Merged-In Ic8f6fa662710ca2ed20c562787fb64ebd1415274 with SHA-1 9b5e69d3 is already in history

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



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