Merge "Expose BlobStoreManager.waitForIdle() as @TestApi." into rvc-dev am: b09e2c9584

Change-Id: I7c8d912ec67d6f95fb0d29df896e2abe9074a3c0