[automerger skipped] Merge "Provide more feedback to Settings when sessions...

[automerger skipped] Merge "Provide more feedback to Settings when sessions fail" into rvc-qpr-dev am: 9fbb7519 -s ours am: d23f5afe -s ours

am skip reason: Change-Id I2e8c6f421d2898f97b0ac422b2276edf9ef923f1 with SHA-1 1d0275d9 is in history

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

Change-Id: I83bc3adca45e201d6702ebac1b2f7e66f72d45a9