Merge "Start aconfigd socket defined in configinfra mainline module" into main am: 894577050b am: 30650d6d57

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3284475

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