[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 rvc-dev am: bcb801ef -s ours am: d8128cec -s ours am: 199e4b55 -s ours

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

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

Change-Id: I1ab2bcaf4687667595ae824d55b60f2bedfb4ff4