[automerger skipped] Merge "Use new severity levels and builders" into tm-dev...

[automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d68468 -s ours

am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106963

Change-Id: I69ab1a8fc2ad52089b159f495da40cf50b2e68fe