Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
am: 06e314f6cc  -s ours

Change-Id: I3e7e4818688b8e046499513557825809772a1085