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: 4ffd6caf am: 6a2136b9

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



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