[automerger skipped] Add SafetyNet logging am: 62041d68 am: 8df9b236 -s...

[automerger skipped] Add SafetyNet logging am: 62041d68 am: 8df9b236 -s ours am: b1c88160 -s ours am: 3cb57e27 -s ours am: 44ceeecf -s ours am: 28db8e5c -s ours am: e90a5f43 -s ours am: b57703c0 -s ours

am skip reason: skipped by user wengsu

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

Change-Id: I9902185d7b1b0e33d3bad27886bb5b22a4be4a8f