[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 pi-dev-plus-aosp
am: a58f0da3 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 afc94d72 is in history

Change-Id: I6287e8520f0a26682bd552467c02b5cc7fb2ba0f