Merge "Hiding replied notification icons from AOD" into pi-dev
am: 37e96a8fa5

Change-Id: I60a5aa171261b97b4f6de41515332fa93016eb8d