Merge "Increate testcase timeout for VtsHalHealthStorageV1_0TargetTest" am: 3a4601ba48
am: a0f37d0f3e

Change-Id: Ia966f4a4595303b85565f019a080f44a5f8a5bac