[automerger skipped] Fix race condition in QSTileHost am: 15d116ed32 -s ours am: 151e04b03c -s ours am: ac5e0c4695 -s ours

am skip reason: Merged-In I6ffbb7510e6854f18bc427d1ae1e782918c799dc with SHA-1 6098b8f68b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416449

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