Merge "minadbd: Return battery level via getprop." am: e0e34a7f5c am: 58b5a5a550
am: a216efcb8d

Change-Id: I5116c33aaceab865757bf43922f568b617f75249