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