DO NOT MERGE Add notification settings to backup&restore

Change-Id: I421c7487955ee339f88e3957c973375d0f87e2ff
Fixes: 35655737
Test: presubmit unit tests
2 files changed