[automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours am: acddaabfff -s ours

am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 b7eebde98a is already in history

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

Change-Id: If0951965f6ef8eb9b09cfcb689e23f0ff3b344ef