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

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

Change-Id: Ifd27daeac7a9852fe1f00fbbdcf3c60faf385ce4