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

Change-Id: Ia5f788c3a28ae5b8934281f8c6c9773e38954bb6