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

Change-Id: Iada0039134eb7440f01d6d8dd9fd8f816d76800f