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

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

Change-Id: I0bb6fe167e2ceb97413bcb3a946f62f4cad05d60
tree: 70ea0a423dcbb97667572718c9f932d10c97abe2
  1. iconloaderlib/
  2. searchuilib/