Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743
am: 675839f0fa

Change-Id: Ie4f70a3e95fe96d9b82488affa226d724a4e4278