Merge "Update default for conversations in DND" into rvc-dev am: 03d5c91379 am: 27bee7bfc5 am: 4a96cad599 am: 6e79ec7897 am: 2f6aa92f63

Change-Id: I32696aed2313f06d09c3769d0e58db070b0bbe81