Merge "Revert "More debug for security loggin broadcast"" into sc-dev am: 9ce47a5a am: 1b3b8be1

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

Change-Id: I13bd6d7435a92ca0f50ec65887d84e0569c1b4e0