[automerger skipped] Merge "Deprecate...

[automerger skipped] Merge "Deprecate Expandablenotificationrow#setNeedsRedaction" into tm-dev am: 665f010a am: 2b01bdef am: 2d8425a5 -s ours

am skip reason: Merged-In Ic90ee1f98250bacee475321413037ff4e32892e1 with SHA-1 7e107c20 is already in history

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



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