Merge "Ensure search highlight position when scheduled runnable starts" am:...

Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4 am: c54246e0

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



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