[automerger skipped] Merge "Fix race condition in QSTileHost" into tm-dev am: f3499151 -s ours

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

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



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