Merge "Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe927 am: 598a69a0" into sc-v2-dev-plus-aosp am: 9f66c6d6

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

Change-Id: I0476c48309cfe4a7d9842fa5a465f116f82a302b