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: Ib104a1f052c0a7d6dc38bef2ec9f5293686dc1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>