[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: a46584f9 am: f5b2d5ff am: cb11910d am: 9f3053ec -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: I2b931a71ac06cd1a3553909764d5817a7df107a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>