[automerger skipped] Merge Android 12L am: 9c88414993 -s ours

am skip reason: Merged-In I146a7e642778aa3c5c5c8f0b7f03535de5d9a814 with SHA-1 820707d6c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/2013318

Change-Id: I8a1a8151778562531f1aaf6067f338eb131ab2cd
tree: 1035a20d466e8a3a4a3b9bda27c331438da5f1b2
  1. iconloaderlib/
  2. searchuilib/