Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am: 3eafb6e2c6

Change-Id: I33cac59253e106423680c70d5f79d83402109afd