Merge "Fix timeouts for android::base::WaitForProperty*"
am: 57d78354d6

Change-Id: Ic755f2a42dcbc271aa7271da1988f035f4c18a6b