Merge "Fixed a race contidion in StorageManagerService" am: 782ef476df

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

Change-Id: Ib0a2065b098399f2464463817967ed36e61b4980