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

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

Change-Id: I9a2a801100d3965d38e95c80ece5f4bc0b35cbc8