[automerger skipped] Merge "Fix race condition in QSTileHost" into tm-dev am: f349915128 -s ours am: 391d1c391e -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: Ie14d924282d72002d36f36f848c44762d6704af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>