Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am: 540cb28c5a

Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c