Merge changes from topic "race_condition_tm-d1-dev" into tm-d1-dev am: f247c1b1

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



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