[automerger skipped] Fix merge problems with cherry-picking "Add notification...

[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am: 31a61f63 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221 is in history

Change-Id: I76722b24202892034148a1c1030b8ca4d3417797