Merge "Fix a race condition in acquiring content provider" into sc-dev am:...

Merge "Fix a race condition in acquiring content provider" into sc-dev am: a57d682a am: 9c5409b7

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

Change-Id: Iaa15ec082f6d4caaf9652832e0ab0d7ccc8d9b2f