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

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

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

Change-Id: I81203a8450ceac4a948be4812481b4f9ba27e50a