Merge "Move charging indication vertically on time tick" into pi-dev
am: 5baaf461a6

Change-Id: I455c53bf85fd7fcfe87daef6d76888a37fecb015