Merge "aflags: read from both system and mainline sockets" into main am: ed045d30

Original change: https://android-review.googlesource.com/c/platform/build/+/3398491



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