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

Change-Id: I159037a0fc54831494ce9f4e3dcf2b4237afd9d3