[automerger skipped] Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev am: 1f3c8278e8
am: efdd7bc91a  -s ours

Change-Id: I2f31f4e9a4c7c893f2309fa321a2d8af177ea4ec