[automerger skipped] Merge "Inline notification_row_user_context" into...

[automerger skipped] Merge "Inline notification_row_user_context" into 24D1-dev am: 4e45dba3 -s ours

am skip reason: Merged-In Id07dc8feb39b08b38300ab3f73f98f602dc2a0db with SHA-1 55176f64 is already in history

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



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