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

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

Change-Id: Ia52c056e856950dcad38187fb78243ebc728a8cc