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

Change-Id: Ibe0aefbad6255e04c1df79e62d3808e75143a310