[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: If1342fb8923ba8c081d851a86527f79df35deea2
This commit is contained in: