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

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

Change-Id: Ibe4fcec14650e38f40bf916f46960585a5af548c
tree: 37ed0759b5af2d5e86f59a2634901c970b801e30
  1. core/
  2. services/
  3. tests/