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

Change-Id: Iaf17879b3a708585a2ae4cc7460527a3f998bce4