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