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 qt-dev am: e8426090 am: b95ca39e -s ours am: d44234ae -s ours am: 88bcfad2 -s ours am: fd6761f5 -s ours am: ff3e1795 -s ours" into sc-qpr1-dev-plus-aosp am: 87c34af0 -s ours am: 6df0ba40 -s ours

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

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

Change-Id: I8e1057be332e5ff773089644213d3cf26c4e7740