Merge "Fix a race condition in acquiring content provider" into sc-dev am: a57d682a am: 0c1115f9 am: 7d9b2b7c

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

Change-Id: I72bc43659c9c7b3961e98f0b84b3d10b5fe3b33b