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

Change-Id: Ie747e6d55d2d6ea7c4881bcc3b92a2f3d58d2550