[automerger skipped] Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev am: 5ccb07df85
-s ours am: 5663decd9b
-s ours
am skip reason: Merged-In Ieaa1c9d04a0a9805abb10025f170cd9283b4a906 with SHA-1 9540b9b15b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16965145
Change-Id: I206983fbf56236b15ceb400cdaa6bb77a670e3fc
This commit is contained in: