Merge "Don't crash apps due to race condition." into sc-dev am: 776fea73bb am: 0fbe662c7c am: f0306ed198
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15361457 Change-Id: Ie4de4ddf3146aa997cc37f4be84de0e2fe7bc654
This commit is contained in: