[automerger skipped] use lazy android device registration am: 65f31088e1  -s ours
am: 66fecc9c29  -s ours

Change-Id: Ie10576d7b0d5f43c07d65834546b7f8816f234ba