Merge "Combine SparseArrays in ClientInfo" am: d49dc35cde

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

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