[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: e0d5070b -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: I116e0eb2f800dc3f339daa2e0b9579fa4d9234b0