Merge "Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9cd am: 1941584197" into nyc-mr1-dev-plus-aosp
am: 73ce3f6219

Change-Id: Ieb90ec7103c15f9dc1970ab476b2b920903628e7