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 am: 324ea814

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

Change-Id: Ie945ee63b5df3c494010fba67b5f82a6936d085a