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

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

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



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