Merge "support locale change for notification channels" into oc-dev am: 10bfd918b9
am: 78e2cf9432

Change-Id: Ic11199de2ba7554dbfa8a23ac94e990678f106fa