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

Change-Id: Ic7d61a56b299ba7c722c10345f008b8ba4785182