[automerger skipped] Merge "DO NOT MERGE DND settings redesign" into pi-dev am: e9211d58d2
am: 62491a2c82  -s ours

Change-Id: I5edc0cc8e20b3ef0693cee35cad2be74826d6d75