Merge "Add info string to advanced battery usage page" into oc-dr1-dev am: 94d0a9c554
am: 776fe841f9

Change-Id: I9f3005e2ad9dbfde4c703c509e798e5292b8a1cb