Merge "Merge "Add bubble and shortcut info to notification log debug" into...

Merge "Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e23 am: 75e505cc am: ba8b0693" into rvc-qpr-dev-plus-aosp am: e9f13dde

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Ia8605c6b81ecb13f00da964eb5d99395b1bf8eb3