[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: 6979e0834e -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: I826ef3c5cb2cdc3c3360403b8ca7af2aa08bb9b7
This commit is contained in: