[automerger skipped] Merge "Use more unique ids for safety sources" into...

[automerger skipped] Merge "Use more unique ids for safety sources" into tm-dev am: b111d233 -s ours am: 95766311 -s ours

am skip reason: Merged-In I8815d14fc402cd25bcf49848c86e21ded552a542 with SHA-1 1a372755 is already in history

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



Change-Id: I75bd9bf06bd5e417369b805184768d77fe1edaba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>