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

Change-Id: Iac6657120054846aafff07b2335b631e350a7445