For notification settings, to match the inline settings Test: manual Fixes: 153886531 Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54 (cherry picked from commit edb8dd0ec4)
edb8dd0ec4