add wait_for_keymaster
am: 8f82879901

Change-Id: I2f92e97d8f94b82500be3c371c84a5d3520bb643