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

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

Change-Id: Ide2b6fc5954b703df96e954062dcde58d8551dbf