Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
am: e341462a50

Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9