Merge "Translate SystemUi NotifChannels on locale change" into pi-dev am: 39e2366d4a
am: da5421c3c9

Change-Id: I7434c8232f57a3bb44c54a8e082f51ab6d48c68e