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

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

Change-Id: Ib8ae69eb4c74e0bb29639424218d405a598a5ae8