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 am: b4e74e5a am: 546143b7 am: 457bf380

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



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