Merge "Added error handling to settings suggestions list am: 2197e8d6f5 am: a6e6feffe6" into nyc-mr1-dev-plus-aosp