[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: 90e455e5 -s ours am: 33cd5008 -s ours am: 456c9fe2 -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: I40b59b3d5ce7b631cf02b5549abfaac8f7e443f7