Merge "Use the canonical idiom for sockaddr_storage." into main am: bb261225e0

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2852650

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