Merge "Increase the timeout waiting for the blob commit to complete." am: b4814707e3 am: dddc46eea1 am: 234c98e92d

Original change: https://android-review.googlesource.com/c/platform/cts/+/1553242

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e023bbecce5ac2a848527bb4dc3ee37d06937ce