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

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

Change-Id: If6b1b4d78b28e70e7739726e70089d485c15f7c4