Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743 am: 675839f0fa
am: e406983505  -s ours

Change-Id: I7908bfec8747c8298e37ba4139446c35d0be8794