Merge "Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9 am: 19415841" into nyc-mr1-dev-plus-aosp