Merge "Use new AccessNetwork type in the reporting criteria API" am: e09fba4813
am: 5455d9fe4c

Change-Id: Icd64418ba333adee2a541069643c1168d8cba204