Merge "Prevent data usage dialog from being displayed again" am: 48e8091eda am: abff77e4aa am: 0119a09bdf
am: c23afeeeee

Change-Id: I38f85d00cd1f75ce6fe0c2a82f621e1cb1d939b2