Merge "Update work notifivation settings on upgrade." into pi-dev am: 62931a44e5
am: e205bc2e54

Change-Id: Iff40426c8c7f62bab9a1ca4470b63dd1e00574c3