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

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

Change-Id: I3c39f3ad1394ffab3cb37c4c73a1e3914e957a47