Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master