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

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

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



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