Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb am: 00a8a719cf am: 2be0c9dfc0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645

Change-Id: Ibe4fcec14650e38f40bf916f46960585a5af548c