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

Change-Id: Iee5f8b80ead2427af699f72aad297617b2fc3329