Merge changes from topic \'SettingsMetrics\' into nyc-dev
am: 50b9592

* commit '50b9592e6116f8a6eca5df2753491a7e26ffde6a':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1