Merge "Implement android::base::WaitForProperty." am: 01003d40fc am: d96f68ee21 am: 1f6d1c43b3
am: eecb127a22

Change-Id: I279f9b7bc374dd421936656a6fb2bc37658f6db6