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

Change-Id: Ic0709af5e24a965e1e076f6c99aaab01e6d4f033