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: Iebb1bd98e82a4d5e4fb45b841aabffef23ef439b