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