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: a46584f9 am: f5b2d5ff

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



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