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

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

Change-Id: I6ed1598065cf55021d4ffea88f3c0f21e4e4ff64