Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6 am: d9ec0bbd06
am: bf57406110

Change-Id: I75b02b98bbc9a7f4fc38db191f91ca37dac655c9