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

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

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



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