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

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

Change-Id: Id303924ef226e19c5ef142f5f2cb5bc2565b7783