tree 4401d7991c99f70f56f182a6c48c6047f432b5e6
parent f3bba61c2803756d0186b701b95126ddb6ca8a37
parent bc12155190633b4ab93f9cf9007e6d9ee9e1c11a
author Pranav Madapurmath <pmadapurmath@google.com> 1686077035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686077035 +0000

[automerger skipped] [conflict] Resolve StatusHints image exploit across user. am: 49d19dd265 am: 2a10deb1a0 am: 16291a3d88 am: 09bd04141f -s ours am: 27237c8599 -s ours am: a33d2395b7 -s ours am: b97d97a3af -s ours am: bc12155190 -s ours

am skip reason: Merged-In Ie1f6a8866d31d5f1099dd0630cf8e9ee782d389c with SHA-1 a853f6ba61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23547458

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