[automerger skipped] Merge "Shorten the search box hint for two-pane layout"...

[automerger skipped] Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev am: 0b0e75d7 am: 19bc5093 -s ours

am skip reason: Merged-In I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c with SHA-1 3aec5214 is already in history

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



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