Merge "Added error handling to settings suggestions list am: 2197e8d6 am: a6e6feff" into nyc-mr1-dev-plus-aosp am: fef55d7f Change-Id: If63785f0aac27a1d4f46063079f2eabeeedafeec