Merge "Fix settings test for show_notification_channel_warnings" into oc-dev am: 2d2689add7
am: 43a5185a43

Change-Id: I2037766561cc7f590daa1f6a58482e7c5bd189f4