Merge "Update system notification channels" into pi-dev
am: 374b86a743

Change-Id: Iaa091fe9f67143ffbaef976f75e4ebd2e3814c38