Merge "Clarify notif guts for apps that don't use shortcuts" into rvc-dev am:...

Merge "Clarify notif guts for apps that don't use shortcuts" into rvc-dev am: dee3bbc8 am: 0254a26b am: 2082c2de am: 94dea70b

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

Change-Id: I34b1082142e0d654ae17677a11ce3a2a6ddcaad2