[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 76b735728d -s ours

am skip reason: Merged-In I11a3aa23392b12f83d49fe64c3c208daa980e8dd with SHA-1 9cb069bb3a is already in history

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

Change-Id: I3620146b6169307b3742df69fcef8438a3be1b24
tree: aea03753ccdc4aeb3d5914b9eb75c65ea8f5899e
  1. iconloaderlib/
  2. searchuilib/