Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a06 am: 3f137b21

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

Change-Id: Iebad314ea1354813b68269ef51b4f7a2c8447e9f