[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 820707d6c9 -s ours

am skip reason: Merged-In I4e434816b505b320b78efd90c910bc0a464e6175 with SHA-1 fabee8386f is already in history

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

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