[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: f2b8a4e240 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301704
Change-Id: I887a46d9c72c5624377c525a0d861c26caaee5b8
This commit is contained in: