[automerger skipped] Merge "Read from aconfigd_socket when flag flipped" into...

[automerger skipped] Merge "Read from aconfigd_socket when flag flipped" into main am: 50ef447e am: 5d0fbf23 -s ours

am skip reason: Merged-In Ieef185aabea70b61aab58d764a0a7c42d0afeff2 with SHA-1 9e48e273 is already in history

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



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