Merge "Don't show ringer status if dnd overrides it" into pi-dev
am: a4e8196cf8

Change-Id: Ic6f4fcf844c403f117a49843f5b6ea84f943be41