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

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



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