Halo: Merge new icons order in expanded Pie notification shade

Change-Id: Ic0a7dc26d76bcbed5eb26f2c49e1c4ebc8a39c58