tree e643e3835c55fd859b751b0990fcd0256ba1eb56
parent 3ac285db1519e476c570f51ba6b29910f8e37e7d
parent 23598c2fe0c49e785ecb8ac6e1e1444bebe35d7a
author Julia Reynolds <juliacr@google.com> 1694564506 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694564506 +0000

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760cad -s ours am: 0574a0ea54 -s ours am: 23598c2fe0 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74cf is already in history

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

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