Merge "Combine SparseArrays in ClientInfo" am: d49dc35cde

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

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