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

Change-Id: I53dec01a5517bf4d55a352523fa38a008d6136ae