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

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

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