[automerger skipped] Use more unique ids for safety sources am: 7afcf4ef -s...

[automerger skipped] Use more unique ids for safety sources am: 7afcf4ef -s ours am: e2fd1cdd -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: I40a2183695011f3e055dbad599f1c1b1e60ec136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>