Merge "Add logging const for smart setting suggestion enabled/disabled state" into oc-mr1-dev
am: 312e069731

Change-Id: Ieef7c47fc1c1b00526f70c2c076525e9052307b8