Merge "Add DND indicator to AOD" into pi-dev
am: c6163bf636

Change-Id: Ia6af65c0cc344fba759a7adc8a9463a11452b161