Merge "Set extraInfo on cellular TestNetworkAgents." am: f0f69b46e2 am: 55c89d19f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id194278af5a07dea4d0641c0884c46e77c931938