Merge "Add DND whitelist" into qt-dev
am: aba783991a

Change-Id: Ia327303f06166cd97bcb3ca00d30ae80d74db33c