Merge "Align saved query text" into rvc-dev am: 684466b941 am: ab3846c10c

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

Change-Id: I9b9f2626dc07ac3d761e5ea1ee203287d14e9f68