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

Change-Id: Ief592fc9ca1843572ed1922857f973dfc6537556