Merge "Merge "Fix notification padding and slice collision" into pi-dev am: 0719d079" into pi-dev-plus-aosp am: d34b180a Change-Id: I4c495087b48581a092e7a0d1bd363a0a81b3fabe