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

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

Change-Id: If55cdbe094fb4409f20762109090361a11614768