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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e016fa2cf4907905e3c4f9ab4dbc3d7c0ad418