Merge "Additional settings page for apps bypassing dnd" into rvc-dev am: ef8205b443

Change-Id: I364e575ac849ef06cf9fb11480910c5f4f4ba728