Merge "Combine SparseArrays in ClientInfo" am: d49dc35cde am: 2da35c2acb

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

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