Rename a recently introduced meaninglessly named Settings.System constant

Change-Id: I284fd1acfdd28b5b650b508bc161a13026f64369