Merge "Add timeout support to android::base::WaitForProperty."
am: ff692a5ace

Change-Id: Icbcce8c39374116164d191883b618155059d1102