tree 811ae2e5d14f7362e194e1778b1b266bb43956fc
parent 28003667c09780f62443a93ef01da069ae9ab136
parent 437207f5411419a21527afd5771b7d530cba29d6
author Ashish Kumar Gupta <kumarashishg@google.com> 1690859311 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690859311 +0000

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f541 -s ours

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

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

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