Merge "Don't crash apps due to race condition." into sc-dev am: 776fea73 am: 98d8c4c1

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

Change-Id: Iea451d076078bde46228432423e6ea24593d37f3