Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf

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

Change-Id: I2cab45cff92215389eb6bba7b14270e3329d600d