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

Change-Id: If63785f0aac27a1d4f46063079f2eabeeedafeec