Merge "[automerger skipped] Merge "Add SafetyNet logging if a certain...

Merge "[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8 -s ours am: a7d40af8 -s ours am: 776b1715 -s ours am: 7b683893 -s ours am: f2b8a4e2 -s ours am: a3ddc318 -s ours am: e0fdc29b -s ours am: b6ada92e -s ours" into sc-v2-dev-plus-aosp am: b3d782ad -s ours

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

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

Change-Id: I6b93573e6bdaa85196a399f157c7f125c79666c7