Merge "Provide more feedback to Settings when sessions fail" am: 9df1022c7a am: da78e17b0a am: 6d6a965712 am: d98ecc564a

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

Change-Id: I3c39f3ad1394ffab3cb37c4c73a1e3914e957a47