[automerger skipped] Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev am: 49499bcb06
am: e493237128  -s ours

Change-Id: I1ea337c1a4ac4b50fcc4cb336987179ba90f7307