Use NotificationChannels. DO NOT MERGE
am: e97112e021

Change-Id: Iad5d22da963bf4575a9070f01989e0fc30fd5591