Merge "Fix race condition in QSTileHost" into tm-qpr-dev am: dc67d818 am: 3480f1db

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



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