Increase timeout for ADB backup/restore of SharedStorage.

This is a manual merge of ag/2161962 into master.

Test: it compiles.

Change-Id: Ice6648554933baf76e96fd151b506564487c91c6
4 files changed