Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev am: 0b0e75d7

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



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