Merge "support locale change for notification channels" into oc-dev am: dd373a838d
am: 7f9b31601e

Change-Id: Iade3dd57f046908e0b4031b5f7a87dd5c1240909