[automerger skipped] Merge changes from topic "race_condition_tm-d1-dev" into...

[automerger skipped] Merge changes from topic "race_condition_tm-d1-dev" into tm-d1-dev am: f247c1b1 -s ours am: fcfe5eec -s ours am: 8c21afbf -s ours

am skip reason: Merged-In Idebd37d1458c80330b60802729575219b6a7b49a with SHA-1 4cbae072 is already in history

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



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