Merge "Use more unique ids for safety sources" into tm-dev am: b111d233

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



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