Merge "Expose BlobStoreManager.waitForIdle() as @TestApi." into rvc-dev am: b09e2c95 am: cf5144d8 Change-Id: Ic2c556ed2472a3ad27165e48e1223f8d18be851c