Merge "Remove notification content from icon a11y" into sc-dev am: 0bd305f4

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



Change-Id: I3e3138e58ee414d0896157848393a0767bab0a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>