Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3

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

Change-Id: I39ebd7e74d548971af7e6581ce77f32b9be82208