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: efa762ee am: 63012b1c am: 0e54fa81

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

Change-Id: I7d408c9cab845261ab154e07839796a7dc3db310