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: 2dd09ce8 am: 8496f0a3

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

Change-Id: I816d5cbd6598cacbac1ce2c81126ad753af71ea2