tree bbbec535a74e0845524e53d22a71bd7974ccc200
parent ee186bffb5669d4095247e5eff353f8f1f45e5e9
parent 570dc26c424ebfc41cbbb589b23074b2f07002dd
author Julia Reynolds <juliacr@google.com> 1694103687 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694103687 +0000

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: d76f26495c -s ours am: 9b5664c305 -s ours am: b064ace3e9 -s ours am: 6373271634 -s ours am: 570dc26c42 -s ours

am skip reason: skipped by user juliacr

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

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