[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 5fe00e207c -s ours

am skip reason: Merged-In I5c1f038864b952892aafeedd03d4c122d39e163d with SHA-1 31404fdd46 is already in history

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

Change-Id: Ifc456d174ba4a1aac8220340f9ba9868ddc9f9ca
tree: 5b4c37764e65ff784b2c0a7f4dbef3f46635eaef
  1. iconloaderlib/
  2. searchuilib/