Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386



Change-Id: I0c2fc9f385694c894bd8a142415401b439ce29c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>