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

Change-Id: I292a19e2a0bdaaf8195b169fed1738cccee910f4