Merge "On device search UI template name cleanup" into sc-dev am: fa4779c886

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

Change-Id: I8d12b11930080b8e8dbb325f2967318e1885902c
tree: 97615f4e332b6933c3ecd5a18fdac586dd816973
  1. iconloaderlib/
  2. searchuilib/