[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 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: Iff4190dde59508f35ae1b5b7d0ac982bc6e137e2