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

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

Change-Id: If20a5de11b4738bfe7f3c738cbe276cab134dced