[automerger skipped] minadbd: `adb rescue getprop` returns newline-terminated result.
am: e3cc180d31 -s ours
am skip reason: change_id I5af47f8ea4d569b8507e259daef87749c0945f47 with SHA1 57a27890ce is in history

Change-Id: I6e660702e7a7880bf709777bce1423e1ab9c145e