Merge "Combine SparseArrays in ClientInfo" am: d49dc35cde am: b54a300513 am: 9838f09f31

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2390563

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