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

Change-Id: I0d52820ea8aa95af93eb1615c4f44110d05f29e5