[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 am: 29c9f61d -s ours am: 9796240f -s ours am: fa76dbe9 -s ours am: d3855970 -s ours am: 6834c638 -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/+/15301701

Change-Id: I9540914af1250d6f905b087e42971cb382f6adca