Merge "Rename safety source ids to match format from other apps." into tm-dev...

Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f0 am: 079d7f45

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

Change-Id: Ibc3df37f6755b12a0f0ac0ca89925d5c8ae8971a