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

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

Change-Id: Id8d953ed538d46f06fbef9bc65e8744440b2d0d3