tree 2396abceb27c54cf2a30507c09a830af30dbb060
parent 627e9bf2ca55d8768b19eb6ab5eb99b259a25c98
parent a33d2395b7f29b7406967bb1e734153103ad5859
author Pranav Madapurmath <pmadapurmath@google.com> 1686073480 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686073480 +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 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: Ida192b8487c6bcaba89cebca08e1ec2fe725cc83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>