tree e9579630e51f70ce60886777237bb522c29c0ed9
parent 3b2129e5f98e34b62baed682a054099e0b414dcf
parent e40584e5aaf36008d9276d346af2652e0aca37a0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1690861833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690861833 +0000

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-v2-dev am: c546ee6ad1 -s ours am: 5b3024f3ba -s ours am: e40584e5aa -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f5737626 is already in history

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

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