Increase the timeout of waiting for commit completion.

+ slight refactoring of the device-side test classes.

Bug: 151960323
Test: atest --test-mapping apex/blobstore
Change-Id: Id04999825889811f3af8020461cbe4602c5eac0c
4 files changed