[automerger] Merge "Hiding replied notification icons from AOD" into pi-dev am: 37e96a8f am: fb0a932c Change-Id: I6633bfc08619d736664eae529fcec03763edbd1d