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

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

Change-Id: I8917dfebd98853a48fc15491e9b3ae16c8db709d