[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours
am: ac6652d37d -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: Iecbf40ae565dea3f2831cd5faee29690f8ec3724