[automerger skipped] Merge "Fix race condition around CE storage becoming...

[automerger skipped] Merge "Fix race condition around CE storage becoming available." into sc-qpr1-dev am: d172b787 am: 09c663fd am: 714f929f -s ours

am skip reason: Merged-In Ice81ae98441b9ed287e8db4196a041c3d47afce9 with SHA-1 7a8bb0d2 is already in history

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

Change-Id: Ia5006818e851a612bad49c1d69ba8545e7507525