[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 oc-mr1-dev am: 83f71f12 -s ours am: b0fccf4d -s ours am: d95a81b7 -s ours am: a8990512 -s ours am: 2ea88737 -s ours am: 5833c655 -s ours am: cce33c35 -s ours am: 1444f990 -s ours

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

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

Change-Id: I5fa86dc26d3f063375b970509259b04dc81423af