Merge "Route flag requests to both sockets if mainline aconfigd is also...

Merge "Route flag requests to both sockets if mainline aconfigd is also enabled" into main am: f4eb0620

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



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