Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5 am: c612271990 am: 3732b76a96

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e016fa2cf4907905e3c4f9ab4dbc3d7c0ad418
tree: 5e128caad23fa0f4efea5a589200d7207cbd5d52
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS