[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-qpr-dev am: 8ec1b123 -s ours am: 5a215b12 -s ours am: 9ec070a7 -s ours am: 419a46d2 -s ours

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

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

Change-Id: I7a29cb64b2270d96935a5a290dfa43e02c87e08a