[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is...

[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090 am: b95ca39e -s ours am: d44234ae -s ours am: 0e04f5ea -s ours am: 88612b95 -s ours am: 747d0724 -s ours am: aceaca30 -s ours am: 98ebbf81 -s ours

am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b7316 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301703

Change-Id: I82c2882b888522de01d88ba87eeb9c2d5d5fc73a