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

Change-Id: I4caf6b8c82f1654c14ec80603d99eb24f63d0d91