[automerger skipped] Merge "Remove notification content from icon a11y" into...

[automerger skipped] Merge "Remove notification content from icon a11y" into sc-dev am: 0bd305f4 am: d09d1748 am: 62529f9e am: e2247c86 am: b4e74e5a am: 546143b7 am: 457bf380 am: 86cbcc38 am: 63287c47 -s ours

am skip reason: Merged-In I3d3b7329c187808a28663aab16838a93a288b051 with SHA-1 e55a350c is already in history

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



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