Merge "Update dnd settings summary" into pi-dev
am: 8ecf40491b

Change-Id: I73182fe8a2b28da1968e628ce17f7149303d8507